Removed example test file.
Merged 'develop' into unit-tests.
Merged 'unit-tests'