Added TAG and bundled test