Fix invalid model names
Add first unit test
Fix invalid model names
Add first unit test