Tests are in desperate need of an update. Update to ensure all are passing and we're covering new functionality.