Restructured unit tests.