all tests cleaned up and sped up