Add unit tests for #88