Updated Tests
minimized complexity in validateinput