Got the first test to pass
Got the other tests to pass.
General clean-up