tests updated to be make it less prone for failure