Cleaned up the source and got the tests to pass