Updates to sync with Tom's changes
Re-added zero, one functions
Minor fixes to tests, rename grad, Gradient -> gradient