Another bunch
Tests
Fixes + tests