Refactor Tests v3