Cleanup plan metadata (fixes build)

- Drop @Override (this broke build)
- Move setter/getter to canonical place
- Add test