fix tests, hopefully for real this time