fixed tests for @166bacc