Added Input test, fixed input issues.