use indentation to cleanup merge_spec
cleanup a few specs to use helper methods