move self method to top
remove old comment
add spec its and factory girl