minor fix
minor revise
Update the test frame to have more flexibility on the definition JSON file
2nd Major update
remove unused files