Changed tests and docu