Test implementation
Small refactor