Trim Promise/Future API down to the essentials
Misc test updates