Deleted and added some files in tests (see todo.txt for more info)