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