organize/clean some tests