Removal of obsolete tests and fixup