changed method names and accordingly updated tests