Changed Tests, corrected Typecast-Issue