* Expanded intitalState definitions and unit tests