Added more tests and implemented functions to parse parameters