Restructure tests to ease updating.