Fixed a couple of bugs (and skip some input based tests)