Get tests to pass again. Remove problematic 2.4 build from Travis matrix.