fixing issues related to failing tests...mainly concerned with shutdown, it seems.