fixed tests for real this time