Cleanup of WisprController. Removing dependency of datastore from the controller. General test cleanups