#54 test fixes