minor update to methods used as well as some updates to tests to deal with random failures