bug fixes in tests?