Added state cards
Some state fixes, also expanded the configuration test