added more tests from feedback of issue #315