Cleaning up and separating tests