cleanup and reorganize tests