Make unit tests happy again

More hacks to allow Limba to be unit-tested