Minor cleanup. Add tests for One().