Resolving tests issues 3