Fixed tests failing due to associations - next will enfore non-null FK's