remove assertions, adapt tests