Updated tests, bug fix for no input file