Fixed up tests to use automatically added user, first test passing.
Updated cleanup, sketched out service principal stuff