fixed tests, small fixes