Travis Build : Fix test suite - Note to self, do this in a branch to quickly squash it next time.