fixed import errors in tests
Merge branch 'devel' of github.com:SheffieldML/GPy into devel