Removing old binding tests; coverage up to 76%