updated tests, and disabled state