Removed some unnecessary startup calls from Input
Made test files more consistent with one another