Implementing the savedInstanceState related point.
Updating tests with latest from Adam and updating Test2 to fit the needs.