Refactored test names + Small fix in test