Added OAC tests 204-208, 236 per #20