refactored - test removed with later was duplicated with more specialized one. Logging implemented with time