Adding Unit Tests for validating module and preparing development of new functionality. Right now 13 of 21 Tests failing.