last few minor modification to fix the build and renable the tests