fixed up issues with unit tests