fixed tests (really)