Additional testing and code tidy-ups