Major cleanup of testing, more tests added