Add test scaffolds
Merge branch 'unit-tests'

* unit-tests:
  Add test scaffolds
Flatten directory