Custom resolver class moved to test