cleanup, add matchers, add some failures when user does not exist