Added measure options under "add new test types"
Clean up