add another test + some test cleanup