Expanded Context test; fixed found issues