Minor tests added
merged changes