added and seperate the function in an extra Class and first simple Test refs #2518