python module/class reorganisation, top level test target