Clean up the test globals
Update version