Fixing failing build due to problems with test implementation