Fix initial migration to use generic user model
Fix runtests