Minor cleanup
Test entities + migrations
Merge dev and master