Updated unit tests so each class extracted earlier is now tested individually