test/functionCall.marbles appears to be working now, other fixes