Adds state tests and structures