Removed todos from tests.
Refactored specs to not use #value.
Extracted null_callback method
Added tests for defer being called