Really finish refactoring now
Add unit test for servers_to_create
Add unit test for create_servers