test cleanup
optional params now working