Restructured the unit tests for clarity..