Adapt fixtures to changed database schema+
Adapt tests to changed object layout
Handle different change column names
Continue rename refactoring
Re-implement watcher deletion
Remove superfluous fixture