Cleanup and pass test 7