Update tests for abstraction. Confirm headers passing.