More unit tests for #3