Grabbing Tests from @shiftkey's work

Not quite integrated, but the code is there ready to be worked on