Increase tests, and tidy up