fixed staging test and one more base template change