Logic query for IF, AND, || with CALCULATE and COUNTROWS function

Hi all,

I am sure this is very simple, but I am really struggling with this bit of logic for CALCULATE, COUNTROWS & FILTER Functions. I have the following table called 'Test'

If today was the 31st Oct, then I would like to count all of the rows (that were last week of the 31st Oct) as per the conditions below.
The result that I am hoping to achieve would be 5 i.e counting all of the rows above with dates.

I want to do the following calculation for everything that is 'type' = "1", "2", "3"

Completed Lasttwk = CALCULATE(
COUNTROWS(test),
FILTER(
test,
test[Status] = "Completed"
&& WEEKNUM(test[Actual End])
= WEEKNUM(TODAY())-1
&& YEAR(test[Actual End])=YEAR(TODAY())
)
)

However if 'type' = "4" then do the following

Completed Lasttwk = CALCULATE(
COUNTROWS(test),
FILTER(
test,
test[Status] = "Completed"
&& WEEKNUM(test[Planned End])
= WEEKNUM(TODAY())-1
&& YEAR(test[Planned End])=YEAR(TODAY())
)
)

I am looking for a sum of the COUNTROWS for both of the above calculations.
Any ideas how i can apply this logic to correctly COUNTROWS of the 'Test' table.

Any ideas gratefully received