Refactoring test + add media