Changing Trophy tests to use expect syntax and putting back in the cleanup trophies