Some test bugfixes, version 1.5.1