Remove unnecessary DB changes, fix test client import