Fixing the fixtures linking issues