Fixes build.
Fixes test.
Test expectations are based on the current reality.
Updated test to reflect current functionality.