Wrote unit tests and implemented user defined input