Enhanced the test specs
Linked helper to specs