delint and update test to reflect changes to server