Unit tests now pass again. phew!