Fixed tests etc