Tag model struct fields properly to play nice with others
Remove a bunch of debug prints in tests