Added several tests and did minor fixes and changes to default values
Merge conflict resolved