Adding validation unit tests and refactor code for proper testing
Merge pull request #3 from skymeyer/update_unittest

Adding validation unit tests and refactor code for proper testing