Even more flexible tests to account for travis