Reset test files according to master
Move A_CALL + A_RETURN to the end of the enum for binary compatibility

According to review comments.