Cleaned AO_scheme added tests