Rescue tests lost in master branch merge, move old tests out of the way

Also fix the broken tests, written by Roan

Change-Id: I0b2a4996dbaad67a5bea53390f26416eaed36b3f