fixed tests and stuff