Refactor testing stategy