Minor changes.
Added new tests