Fix up unit-tests so they are runnable under python unittest