Clean up syntax on models and unit tests