Six tests still failing...