Fix unit tests

Fix the unit test to run individually. These do not yet run all at the same time due to lack of proper clean up on test completion.

@Primer42 @byxorna