Fixes for Test/Emul classes to pass Travis CI

These are the changes I've made to try and get the Travis CI project to build correctly on my repo. Hopefully we can all refer to Travis CI as our main CI build from now onwards?