DeferTest.java - added unit test missed in initial port
When.java - added overloads to map() and some() without all the callbacks.