Merge "use apex_test for test apexes"