Get rid of #test