fixing test config and tests