Refactor config
Check with expected
Simple tests