Fixing test assertions and adding correct override.yaml