Fixed two tests, 1 left