fix up tests, remove code accidentally left in