Clean up spec helper
Update comment spec to use factory girl