Updated spec function names to not use 'should' per @henrikbjorn
PSR-2 fixes and cleanup