refactor songs controller spec  and macros