Fix failing unit tests for HLL