Adding some test support, and notes on things