Boilerplate example dir and bug fixes
Clean out test dir for boilerplate
Boilerplate test suite and bug fixing
Manifest updates