Topic: Engine Startup Rig Wiring Questions
Just finished building my second engine and rather than swap it with the engine in my bug, I'd like to start it up and break it in outside of the car (ie: on the floor) I plan to build another engine in the spring, so having a "start-up rig" will be handy.
I've got a urethane mount to hold the starter in place and I have a starter. The mount came with one switch to engage the starter/solenoid but the instructions only explain how to run the engine for a brief period, directly off the battery (basically, an oil leak test)
Rather than potentially run my battery down (and ruin my break-in before its had a chance to warm up) I'd like to build a complete start-up rig with oil pressure light, alternator light, and the complete charging circuit enabled so that I can do a complete break-in rather than just an oil leak test. This way, I can test for oil leaks, set my timing, setup the carb, and make sure that the alternator is charging.
I've done some reading today and I think I understand (the fundementals of) how the wiring works but I'd like to get some opinions. This is what I've come up with so far.

Please let me know if there is anything wrong with this diagram. Its not meant to be pretty, I just need to know exactly how everything is connected before I start building my rig.
Assumptions I have made which may not be true:
The starter, Alternator, and oil pressure switch are grounded through the engine case and frame but for my purposes, I can just ground the engine case to the battery negative terminal.
The alternator warning light does not have a ground, and only lights up when there is an imbalance between the alternators output on D+, and the battery output on + terminal.
The alternator warning light shares power with the oil pressure warning light from the ignition switch.
The starter switch engages both the solenoid and the starter motor at the same time
I plan to start building this rig soon. Your opinions and comments are valued. Please don't copy this image until we've established that it's valid and not going to blow anything up if implemented in real life. I'll post an updated image if anyone can suggest modifications.
Thanks for your help!