Fix failing stand alone tests