Fix expressions and replimoc test cases

.. Everything should be green again :)