Reorganised behavioral test module & namespace