New unit tests implemented