Fix unit tests - broken before branch was created :-(