Fix tests. #213. #181