Cleaned up

Summary: Cleaned up test code.

Test Plan: Look at code

Reviewers: michael-test

Reviewed By: michael-test

Differential Revision: https://phab0.met.no/D6