#1.0: tests fixed