cleaned (more or less) tests