Fixes to get test working