General tidying and testing.