Edited bin/run file to accept 3 arguments
Added tests.