added APGL, modified test