adding more tests
renaming private methods