remove unecessary tests and refactor bisect tests a bit