Revert last hackish test refactoring and use test name in test path instead