Add exceptionhandling
modified Tests