refactoring tests, fixed area tests