More thorough unit testing on feature #163
More thorough unit testing on feature #163