Fix more tests. #170