#2: tests fixed