Continue unit test refactoring

* Removed the dependent data collection. Instead, generate each data
individually
* Test cases for lots of unit tests
* Using the Nunit contains assert instead of contains equals true