Fix several broken unit tests.
Merge pull request #58 from DrMarcII/master

Fix most extension unit tests