fixed merge problem: extra test method was added