Test views reorganized