Reorganise instances and add tests for new prisms