adapted / refactored tests