fixed tests properly