ADD Capstone tests in new formats