Added area, and test cases