fixed files, added more tests