#13: Fixed tests.