Checking arguments logic improved after tests