Clean up and refactor
Added a simple test for parameters passed to startup scripts