Tests failing - still no idea why.