fixed failing tests. ups :-(