Restructed unit test layout.