Move some tests around to avoid compile failure