Nearly fix test suite
Completely fix tests - woohoo