Fix tests to use new lib