fix broken tests; even more noise reduction