Fixed configuration mistake and tests