fixing unit tests... 3 to go