Fixed input bindings. Removed calculator test (still failing in travis).