Just minor modificatins during tests