refactoring of accountBoundaries-Handling
added tests