Fixed config and unit tests