Fixed tests #2