Start removing need for server to be dynamic, and add a new test