Re #922 - fixing issues with corelib-utils tests...