Adds tests and unifies area definition