Change test modules to Expectations

Tests cannot find these methods when running in Ruby 2.1. Moving these methods to the Expectations module will work.