some test cleanup and model inits