Additional unit tests written