Fix test failures brought by #28

Fix test failures brought by #28