Add turn off button

 * Fix tests