Quick fixes to testing