fixed testsuite

moved naming functions into queue