No longer attempting to reject a resolved promise within [PMKPromise when:]. Fixes #97
Fix tests
Merge oztune-master