Updated config and tests