Refactor tab tests
Resolve failing unit test