Readded location hierarchy models / tables and tests