Minor formatting of code and put the test back for post deploy.