rename some methods, simplify tests