Change test modules to Expectations