Fixed tests, though might be hiding bugs