Fixing logger
Adding new Tests