Correct gitlab test annotations

General MR

Summary

This MR adds annotations to better control the creation and deletion of test resources. It also corrects an issue with a test service using an invalid value.

Relevant logs/screenshots

Linked Issue

issue

Upgrade Notices

N/A

Closes #322 (closed)