Changed tests to match specifications of @500 on piazza