Improve populate and product model tests - Issue #4