merges, mostly

Can you also help me fix tests?