Fixed tests - travis works :)