Fixed wrong placed if-statements and removed tests without implementation because of no code attribute