Yes.. much better way instead of `subs`. will update the test.