Testing and fixes, modifications of functions (unclean commit, testing files)