Restructure tests a bit again.