changed feature steps to reflect behavior.
merge tests not working still though.