Added Test projekt, refactored a method