Cleaned up a test implementation