change method names, add new testmethod