Added State and StateTest