[WIP] [2.0] fixes tests

Let see if Travis is okay...