Move location of quinfunction, names in test