fixed failing async tests and double load bug, thanks David