Revert "Just checking if travis pass with old images - Revert "fixed tests""

This reverts commit 40e575711e1399e408e0a625ba5e19191143b4c7.