BS-8920, merge more methods & remove needless tests.