Minor tests fixes