Fixed autoloading
Tweaked unit testing
Merge branch 'dev'