Work on #489. Created tests to validate all input parameters