fixed tests with new behaviors
merge