Finish test and start adding acontour

To be refined(And area analysis can be refined too)