Fixing import issue with unit tests