Refactoring: Combined methods that did effectively the same.
Extended test cases.