More tests, fixes

- Fixed a parent’s resolve content not being passed in to a child state
when the child state changed but the parent stayed the same
- Fixed current state never being remembered when the state changed