Fixing tests to work with new .json/.atom routes