Fix the tests. Fix #42