Few fixes; Tests added.