fix 37 (added all tests (I suppose))