Fixed tests.
Merged sharad's commits.