Cleaned up
Cleaned up and added new test results
Clean up