Cleanup tests to make them better example