Added the Location entities and some more tests