Merge "Revert "Adding module tags so tests get built by default.""