Added defaults to allow tests to pass