fix tests broken by new fixtures and fix loader bug