Interim commit - bug fixes, added multiple argument lists to main test function/driver and each setup function