refactored tests to be less busted. Still not at all usable though. ???