small fix; new tests