Zounds... it all runs

Just odds-n-ends to get all things in junit.py & test.py.