Merge pull request #70 from Mause/plugin-and-api-tests

Started on API and Plugin utility tests, though still need some more work
Merge branch 'master' into common-test