Got failing tests down to 5....