Fixed tests

Let's see what Travis says!