Updated input and tests mostly green