Move method definitions
Fix failing specs