55 Re-organize test environment