LPS-37352

Use this PR to base your tests off. I did some cleanup, so you'll want to use this instead.