Tidy up. All tests now working.