Restructure tests somewhat.