Countifs arrays with multiple criteria and subtotal function

[5150]

All,

I need some help with COUNTIFS ARRAY formulas that I have in this spreadsheet that are based on multiple criteria. I am trying to figures out how to make them adjust according to visible filtered items from the DATA tab. I have the subtotal functions working properly on all my other calculations (RANGE G15:H19), but I'm having issues with the COUNTIFS type ARRAY formulas (RANGE G20:H21) adjusting and calculating the filtered visible data from the DATA tab when the data is filtered or not.

I have 2 test columns with 2 different count array formulas. Test2 column is working and adjusting, however, Test1 is not because it does not have a Subtotal Function Element added to it and I would like to know how to add that Subtotal Function to it, so that I can test both arrays. As a result, I'm questioning the variances I'm getting of. I'm not sure which one is correct. I attached the XL file with added notes to the DB tab to help you troubleshoot my problem.

I really appreciate your help so much guys!