minor bugfixes and a test extension