Improved the input tests