Unit tests for issue 71 and 210