27 Re-organize test environment