Started adding a skeleton set of unit tests
Merge