Rework test setup, fix spacing, and add options page test