Unit Test changes and updates.
Added a second layer of tests from my project.