Added on and off buttons. Detect a error in tests. Correct it.