Attempts to get all tests working.. Failed