Cleanup
Complete the tests