Fixed some stuff in input, fixed tests once more