Cleanup and commit test