Use Java-based Spring configuration for model testing
Move util class into model module with rename
Get rid of redundant test