Added tests for read_file
Removed setup_function from test_morris_optimal
Python 3 compat
Rebased on morris_class