fixed up tests; couple small promise bugs