Various fixes which get the existing ruby test cases (via the language