adding fixes to test, updating server w/ unicorn