Refactor Tests v2