Ora-monkey test improvements