Some changes to get tests going
Merge pull request #445 from gannetson/feature/fix-tests

Some changes to get tests going