Adapts test helper to changes in core
Fixes remaining bugs and renames database aliases