moved some tests around