add new tests, remove debug prints