more test clean ups; remove useless errback