Fixed bug with event in area and added testcases