Add test cases (well beyond 75% code coverage now)