fixed tests with no wrap