okay reorganizing the way the rekall tests are done; also excluded two o...

...f them for now