Test fixes; cleanup