entities spec tests cleaned and added to in preparation of changing ordering