Work on tests. Fixing bugs
Split tests