#1: tests fixed