Merge pull request #6 from mbabker/PR4279

Some mods, stuff works, I think
Try is_null
Try moving it around
Revert back to initial implementation
WIP - Isloating test dependencies in app tests