Restructure tests slightly.