Updated unit tests to separate each test case into its own test.