Fixed HW#1

Fixed tests!