Add builder decorators.
Flake8, remove old test.