Make all places where we accept 3o5 also accept 2o3 and add tests validate such.