remove some duplicate tests, fix test output