Revert "Revert "Added Unit Tests (Incomplete)""

This reverts commit d959145854733e64af3d537191d6c60ee0b43157.