Extra unit tests for #5