Test cases, add (return) function, work on exception handling