Update state classes. Moar testing