Fixed some tests; added location model; changed weight to live_weight