fix #15 also fix the tests...