Replace load with include, some reindent
Added file to run all tests.