Create a helper function for both-tests
Test multi subs with trailing comments
Update TODO matrix