Fix test cases which are now wrong due to previous binning error
Improve test coverage