Some small changes to the build to make the testing a bit more flexible