Skip fixed

Fixed state capture bug.
Added unit tests.