Fixed broken tests
merged and fixed tests