Clean up migration/error model
Tree structuring tests