Feature/api queries stars

@mtakac as I mentioned in a previous PR, you might be able to DRY up some of these assertions using json_spec.