Move wait logic to individual service classes; comment out some in-progress tests in preparation for moving to rspec.
Move from Minitest to rspec
Replace "context" with "describe".