Changed import
Added tests of input