got two more tests working