Fix unit tests for #162