Small state instantiation refactoring
Fixed tests related to states