Updated REST, some tests not pass