Simplify gallery model and update tests