Fixed test data generation
Updated model helpers, removed redundant code