Undo temporary stuff
Further development of tests