Yeah, we do also have a 60 second push up & sit up tests, but I can already score max numbers in them. The chin-ups were cut recently from the tests, because somebody thought they were too hard to be tested at all. Sounds ridiculous to me.
I'll definitely take your advice on the complexes. How often do you think I should add them?