Updated fixtures, and fixed some spec issues