Resolving tests issues 2