Unit Tests updated