Removed tests, added custom button values and fixed allow statements.