added test/fixed tests