Added more unit-tests and fixed a smaller issue with the ordered representation controller