Test with config
Tests after refactoring