#1 - fixed tests