Merge pull request #50 from ethomson/init_shutdown

Actually prototype the function declarations
Handle -s specifications for tests