Updated test config and unit test