general cleanup after fixing the tests