Post-review fixes
Split tests