mv static_state and fix test