code cleaning
order!
more order!
seperated tests for kodimon and prosiebensat1