Random little changes/cleanup
Fix tests