some changes
Implement architecture for unit testing
Merge branch 'master' into UnitTests
Got Unit Testing working
Merge branch 'master' into UnitTests
Merge branch 'master' into UnitTests
Some Unit tests
Merge branch 'UnitTests'