Updated factory associations and corresponding tests.