Tests enhancement end serializer usage refactoring.