Improved Crappy Test Interface

But it is still very crappy