Fixed some null pointer errors in EntityTest, added TODO to remember to lookup why later