Moved some tests around