add jon`s tests from his implementation