DONT MERGE YET Fix develop tests

Fixing develop tests - requires lots of docstrings and examples. I'll finish this up tomorrow.