update changelog, minor tidy up of test code