- moved code to test spec
Merge remote-tracking branch 'origin/master'