fixing test runtime issues