per request from author, singularized button option and removed checks for private vars in tests
Fixed option.button test suite name