Cleanup of test, addition of color object