Updates to clean up test. Need a better way to wait for the server to
start.