Need Test help: Reporting an accurate score when a test is optional

I'm developing a course where the user self-selects which modules are seen based on selecting their approval authority on the opening page. Depending on their choice, they will review Module 1 alone, or both Module 1 and 2. Each module has a test. When I published to the LMS, I expected the scoring to ignore Test 2 if it was bypassed, but it's factoring in as if they scored 0 on it.

How can I structure the tests, or input some variable actions, so that the final score is correct? Currently, Test 1 and Test 2 are in different test chapters.

Also, is there a way to display the contents of AICC_Score without publishing to the LMS? It's a large course, and requires assistance from our vendor to upload, so I want to test everything I can before submitting it. I tried simply inputting a change action on a text box to display AICC_Score, but it's not returning any values.

It seems like these both should have easy fixes: I appreciate any ideas you can share, and let me know if additional details are needed. Thanks!!

- Jim