Refactroring some names and test config