clean and reorganize tests a bit